From: Rob Church <robchurch@users.mediawiki.org>
Date: Mon, 25 Jun 2007 16:07:49 +0000 (+0000)
Subject: Revert r23395, since it won't work (d'oh, of course)
X-Git-Tag: 1.31.0-rc.0~52402
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=4a55dcdda839719bfae7bc7226d6ac3418223c38;p=lhc%2Fweb%2Fwiklou.git

Revert r23395, since it won't work (d'oh, of course)
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index cbc8e45cd4..ed5674f788 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -387,10 +387,8 @@ class OutputPage {
 		$this->mTemplateIds += (array)$parserOutput->mTemplateIds;
 		
 		# Display title
-		if( is_callable( array( $parserOutput, 'getDisplayTitle' ) ) ) {
-			if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )
-				$this->setPageTitle( $dt );
-		}
+		if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )
+			$this->setPageTitle( $dt );
 		
 		wfRunHooks( 'OutputPageParserOutput', array( &$this, $parserOutput ) );
 	}
diff --git a/includes/Parser.php b/includes/Parser.php
index 50f9ac1e70..e4418cd51c 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -12,7 +12,7 @@
  * changes in an incompatible way, so the parser cache
  * can automatically discard old data.
  */
-define( 'MW_PARSER_VERSION', '1.6.1' );
+define( 'MW_PARSER_VERSION', '1.6.2' );
 
 define( 'RLH_FOR_UPDATE', 1 );